Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 00:23:17 +0000 (00:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 00:23:17 +0000 (00:23 +0000)

Trivial merge